From a898aa76d5425b40b2c93e4aae4951e6df58afea Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Mon, 3 Mar 2014 00:30:35 +0000 Subject: [PATCH] Further tweaks for Windows deployment. This was used for the 302 beta. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4768 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/gui/makesetup.bat | 17 ++++++++--------- gpsbabel/gui/setup.iss | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat index 8da542db2..1a0b8cc9e 100644 --- a/gpsbabel/gui/makesetup.bat +++ b/gpsbabel/gui/makesetup.bat @@ -4,7 +4,7 @@ rem Copy the Qt stuff into a local directory. The Inno Setup compiler rem cannot handle %QTDIR environment variable in the source file rem specification -echo on +echo off rd /q /s qtdir mkdir qtdir mkdir qtdir\bin @@ -16,7 +16,7 @@ mkdir qtdir\mingw rem Basic Qt runtime DLLs rem if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat -if "%QTDIR%"=="" call \Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat +rem if "%QTDIR%"=="" call \Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat if "%QTDIR%"=="" set QTDIR=\Qt\Qt5.2.1\5.2.1\mingw48_32 copy %QTDIR%\bin\Qt5Core.dll qtdir\bin copy %QTDIR%\bin\Qt5Gui.dll qtdir\bin @@ -24,10 +24,10 @@ copy %QTDIR%\bin\Qt5Webkit.dll qtdir\bin copy %QTDIR%\bin\Qt5Xml.dll qtdir\bin copy %QTDIR%\bin\Qt5Network.dll qtdir\bin rem copy %QTDIR%\bin\mingwm10.dll qtdir\bin -# Because *obviously* libraries should live in the bin directory... +Rem Because *obviously* libraries should live in the bin directory... copy %QTDIR%\bin\libwinpthread*.dll qtdir\bin -copy %QTDIR%\bin\libgicu*.dll qtdir\bin -copy %QTDIR%\bin\libgstdc++*.dll qtdir\bin +copy %QTDIR%\bin\icu*.dll qtdir\bin +copy %QTDIR%\bin\libstdc*.dll qtdir\bin copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin rem Image format plugins needed at runtime, but not debug verions @@ -40,11 +40,12 @@ rem Mingw runtime support copy %QTDIR%\..\mingw\bin\mingwm10.dll qtdir\mingw rem Copy QT's own translations (Apply/OK, and the like) -copy %QTDIR%\translations\qt_*.ts qtdir\translations copy %QTDIR%\translations\qt_*.qm qtdir\translations del qtdir\translations\qt_help* -rem Generate the compiled translations +rem Generate the compiled translations. All of this makes sense only if +rem the you're doing releases strictly +rem copy %QTDIR%\translations\qt_*.ts qtdir\translations rem lrelease gpsbabel_de.ts rem lrelease gpsbabel_es.ts rem lrelease gpsbabel_fr.ts @@ -58,8 +59,6 @@ rem lrelease gpsbabelfe_it.ts rem lrelease gpsbabelfe_ru.ts rem for /f %%a in (dir /b *.ts) do lrelease %%a -copy ..\msvc\Expat\libexpat.dll release - "c:\Program Files\Inno Setup 5\ISCC.exe" setup.iss rem cleanup diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss index b4530ef8d..0f85968a7 100755 --- a/gpsbabel/gui/setup.iss +++ b/gpsbabel/gui/setup.iss @@ -16,7 +16,7 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} AppName=GPSBabel -AppVerName=GPSBabel 1.5.0-beta20140214 +AppVerName=GPSBabel 1.5.0-beta20140302 AppPublisher=GPSBabel AppPublisherURL=http://www.gpsbabel.org AppSupportURL=http://www.gpsbabel.org @@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org DefaultDirName={pf}\GPSBabel DefaultGroupName=GPSBabel OutputDir=release -OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup +OutputBaseFilename=GPSBabel-1.5.0-beta20140302-Setup SetupIconFile=images\babel2.ico Compression=lzma SolidCompression=yes -- 2.30.2